Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5 ➡️ 6 #888

Merged
merged 38 commits into from
Jul 1, 2021
Merged

5 ➡️ 6 #888

merged 38 commits into from
Jul 1, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo5 to main

Branch comparison: main...ign-gazebo5

Requires gazebosim/sdformat#604

I had to combine 2 new widgets in the ViewAngle widget coming from separate branches, this is the result (FYI @jennuine and @iche033 ):

5-to-6-viewangle

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

adlarkin and others added 30 commits April 29, 2021 14:16
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
Signed-off-by: Martiño Crespo <marticres@gmail.com>
Signed-off-by: Mabel Zhang <mabel@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Mabel Zhang <mabel@openrobotics.org>
Signed-off-by: Martiño Crespo <marticres@gmail.com>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
…eters (#812)

* Add service and GUI to configure physics parameters (step size and real time factor) (#536)

Signed-off-by: Maganty Rushyendra <mrushyendra@yahoo.com.sg>
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>

Co-authored-by: mrushyendra <mrushyendra@yahoo.com.sg>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Luca Della Vedova <luca@openrobotics.org>
* Working on a trigger delay

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updated tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update documentation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix spelling

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* tested halt motion feature

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* added flag to turn off movement halting

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* Moved logic into gamelogic

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* docs

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* moved everything into gamelogic

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* test added

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* add conversion for particle scatter ratio field

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update integration test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update comment

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
)

Signed-off-by: ahcorde <ahcorde@gmail.com>

Co-authored-by: Michael Carroll <michael@openrobotics.org>
* Fix race condition when rendering the UI

This fix depends on a fix in ign-rendering module, because it
depends on the new Camera::SwapFromThread function
Without it, compilation will fail

Affects gazebosim/gz-rendering#304

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Force serialization of render commands

This avoids us to break ign-rendering ABI while also simplifying the
amount of work to be done

Serializing work is easier to maintain and debug
Only CPU-bound scenario would potentially benefit from parallel command
generation (in terms of UI responsiveness)
Parallel command generation can be added back later

Also fixed coding style

Refer to
gazebosim/gz-rendering#304 (comment)
for discussion

Affects ign-rendering#304

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Fix deadlock on initialization & shutdown

Also fixes preexisting race condition when shutting down and improper
uninitialization of the worker thread

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Fix deadlock when using MoveTo modifier

Fix coding style

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Reimplemented synchronization mechanism to fix deadlocks

It's a good thing we went for serializing rendering.

THe way Qt implements the double buffer scheme using signals & slots is
fundamentally flawed because it assumes the worker thread never needs to
synchronize (e.g. to invalidate FBOs if window resolution changes).

Trying to synchronize can easily cause deadlocks if Qt thread has
spurious updates which don't end up emitting TextureInUse, as the worker
thread is running slower than Qt thread.

A way to fix this could be to use a different synchronization mechanism
where the main thread increases a request counter and the worker thread
is constantly looping but only wakes up when that counter is > 0.

For now, this will do.

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Document RenderSync

Turn some pointers into references

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Document missing parameter

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Document better our use of emit TextureInUse

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

* Change Q_SLOTS to slots for consistency

I changed it because it didn't work, but it must've been old code
because it works now.

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: LolaSegura <lsegura@ekumenlabs.com>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
* add initial draft

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix scatter ratio image path, minor tweaks

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* formatting

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
* Fix issue not configuring links added after start

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>

* Add a test checking the fix

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* Change the diff_drive_system test to cover min_acceleration
  and min_velocity limits. Added those limits to the .sdf file.

Signed-off-by: LolaSegura <lsegura@ekumenlabs.com>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Franco Cipollone <53065142+francocipollone@users.noreply.github.com>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>
adlarkin and others added 8 commits June 18, 2021 17:04
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested review from azeey and iche033 as code owners June 26, 2021 00:50
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jun 26, 2021
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Jun 26, 2021
@ahcorde ahcorde mentioned this pull request Jun 28, 2021
8 tasks
@iche033
Copy link
Contributor

iche033 commented Jun 29, 2021

@osrf-jenkins run tests please

@iche033
Copy link
Contributor

iche033 commented Jun 29, 2021

the updated View Angle plugin looks good to me

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Jun 29, 2021
@ahcorde
Copy link
Contributor

ahcorde commented Jun 30, 2021

@osrf-jenkins run tests please

@chapulina chapulina merged commit 1749361 into main Jul 1, 2021
@chapulina chapulina deleted the chapulina/5_to_6 branch July 1, 2021 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.